Revert r222296 to fix bad commit message