Back out 155b9d4cb8cb (bug 1068474) for Marionette failures