Revert "Merge pull request #24770 from lightsofapollo/bug-1077649"

This reverts commit a30d39af14511f40a85902d181722bdec07143f6, reversing
changes made to 6efba330470a888f20f05fc2afd7f7e7978f31e6.