Backed out changeset 9554986d30fc (bug 1029948) for Bustage