Backed out changeset 5a7b47cb1498 (bug 1058158) for Marionette-webapi permafails.