Revert "Merge pull request #14836 from EragonJ/bug-948847"

This reverts commit 27f6ac2b5591dace72951baebde2345422b6f1e5.