Reverting part of 3e24c750 which removed version check in OverloadResolve to be backward compatible