Backed out changeset a246bbc0c61c (bug 941158) for marionette bustage