Backed out changeset daa82439f77f (bug 1022434) for build bustage