Removed a temporary NS hack (OMS-444)