Backout 0d33af2a2a75 (bug 823109) cause it breaks some Windows builds