Revert 132424 to fix PR10068.