Backed out changeset 5b1f330c9298 (bug 1074736)
Backed out changeset b1ab04e807c3 (bug 1074736)
Backed out changeset 141ea70b1caf (bug 1074736) for win marionette test failures