Reverted one of the changes introduced by the previous cherry-pick.