OHFT-17 reverted back the revert to the version affinity