Backed out 2 changesets for breaking builds (bug 856042)