Revert r22119 and partially revert 22120.