We still need to update this part of Type-OVM to use the new OVM functionality.
This will create a new commit in order to revert the existing changes.
