Revert a mistake (OMS-558)