Back out a37e6c57ae0f (bug 959520) for making marionette-webapi infinitely retry