Backed out changeset 48099863baec (bug 1075438) for add-on bustage