We'll need to to do it in a separate thread/process.
To be done. In the meantime, put it back. It impacts
oaisim.