Cleanup: remove unneeded hack (OMS-230)