bug 998035 - changes to avoid git.m.o load; r=aki