Backed out changeset 48c4d4a97a4b (bug 1029533) for build bustage