After upgrade period, also support old v2 addresses