Fix #1749 by adding an OIT flag.

Turns out OIT can be easily turned on and off at runtime, for example picking temporarily disables it.