bug 831147 - reland 91da030 now that repository is mirrored p=vd r=mwu