Revert r146481 to review possible miscompilations.