Revert random changes from commit#22606.