Backed out changeset 3b96e18dd924 (bug 1030442) for Windows Marionette failures.