Revert "Merge pull request #14872 from EragonJ/bug-950307"

This reverts commit 68f7c6a21a4bb037dc53d632654b6fee36793539, reversing
changes made to 711d8bf4efde6b1aaaf1f61bd422312c17435810.