Revert commits 96556 and 96640, because commit 96556 breaks the