Revert the optimization in r122596. It is correct for all current targets, but