We want to make use of new IDO features without breaking compatibility. This is a quickfix as otherwise we would currently break everything below 1.10. Code contains a few TODOs as this needs improvement.