Backed out changeset 8c0cf60141dc (bug 1083237)
Backed out changeset 9e996cc695eb (bug 937053) for breaking marionette