Revert "Bug 9294:"