Backed out changeset 6ab8ef0895ca (bug 1032880) for bustage