Revert r97726 and r97728 at ddunbar's request; we want to solve this