Partially revert Versioning change