Merge pull request #14996 from mfb/revert-14222