Revert #22251