Backed out changeset af9f873b8bc6 (bug 1107416) for non-unified bustage.