Semantically revert r236031, which is not a good idea for in-order targets.