Revert "Merge pull request #10043 from cconstantine/master"

This reverts commit 521035af530482d6d9ad2dae568eaeb0ab188e1c, reversing
changes made to 222011dbee842bbc60d3aaaa3145356b90a30fd1.

Reason: This broke the tests