RD-2023: Revert version changes