Backed out changesets bc5f5ce22ae3 and 3d682482e90c (bug 880643) for Marionette failures.