Backed out changesets 1ae920a04d36 and a12273aa858b (bug 866272) for Marionette failures.