Backed out changeset a668ab2d8dd3 (bug 1043853) for bustage