MDL-38314 repository: Removed >= 2.5 code logic