Backed out changeset 18034a2d0732 (bug 940329) for build bustage