Revert r8979 (Ugly fix for r8963)