revert 25a3e891: disable -O with JIT again
Merge remote-tracking branch 'origin/master' into p2