Backed out changeset d1962cb07ea5 (bug 1089536) for marionette test failures