[Jaws_ORM]: revert last changes