Revert modifications of ORM