Revert r239503.