Apply changes back to old OModel classes, migration tests are still failing
3 files changed