Backed out changesets 73495103969d and 1a03be1791d7 (bug 911115) for mochitest-bc failures.