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

This reverts commit 1bd937c8c110788fcaec7deefe5f3367def18a42, reversing
changes made to 0bc133e32567bcf6aea7a7bff3b5fb7cde08fdfd.