Backed out changeset 53e7cea7d468 (bug 1077332) for Marionette failures.