Revert 74623/74624 to fix build.