Revert "Merge pull request #16866 from lightsofapollo/fix-bad-things"

This reverts commit 4b0e62c713d83a36d4db42556625a2bc2b44e3f2, reversing
changes made to 6781459a49642ca0eb7ec3e95667808d5d77b656.