Revert r15653.