Revert change 33326