Revert "Merge pull request #13283 from EragonJ/bug-932731"

This reverts commit 9e0df13811b577026b70ccfdcd9b4a309746e8ba, reversing
changes made to 13e51d5f543729bb38cdd054d6452bf3f3e611ae.