Work around bug 859952 until that patch ships in marionette-client