Revert r188756 because some other changes snuck in with it.