Revert change 35595.