Revert r47130, it was already comitted.