Revert r121520, which may have introduced miscompilations.