Backed out changeset ee1a53319c19 (bug 1042092) for m-oth bustage