Backed out changeset c69cc7b3c21d (bug 1016467) for B2G Windows bustage