Revert "Merge pull request #17518 from EragonJ/bug-960861-fix"

This reverts commit 13b00e279ebe5784772c763f730a277fd85f26e4, reversing
changes made to 80af23f8c74d9d2e9388d8ed3c204040b5c528ec.