[OE-3856] reverted bad merge from feature/table-versioning