Backout 65a26453f9a6 (bug 823109) cause it still breaks some Windows builds