Backed out changeset 52632d896ef7 (bug 985614) for m-oth bustage