removed old hack to compensate for OQ definition brokenness. This should resolve part of #294