Revert "!UPSTREAM: WIP fix for 72026"

This reverts commit a9dffa0104355a527f22bac7895d4063f1c1f127.