This reverts commit f3606041 and reapply commit ae15b1e7. JIT test must be annotated to not run on Windows.