Backed out changeset 24484841e7bc (bug 888926) on suspicion of causing Marionette timeouts.