Revert three commits from bug 1040816