Merge "Revert r97711"