Neuter the optimization I implemented with r107852 and r108258 which turn some