For Bug 1061822 - revert all changes from Bug 1060407.