Revert "Merge pull request #12482 from lightsofapollo/921297"

This reverts commit 97cd1c6e3068130c0dce6fd6d12961695ffccca5, reversing
changes made to 8edfa18285f8c36fd6ed783c4e6db81c4c6e9dd0.