Backed out changeset e6b766d8a815 (bug 1065127) for bustage