Backed out changesets 859cf34d6a18 and 290cb088fe58 (bug 964270)