Do not check for unique cf id in all versions

5202 was only added to 2.1