Backed out changeset e457165df2a3 (bug 1077872) for bustage