Backed out changeset 91a4c3026e8a (bug 986811) for bustage