Backed out changesets a8088accbcbe and 6e7e6773c836 (bug 845807).