Backed out changeset 4270acd843cc (bug 863130) for B2G Marionette failures.