Reverted oms_acl changes (STOX-31)