MDL-37742 simplify dirty one-space oracle hack