Revert part of r53282 due to merge out of sync