...but then also have to compare against the intended IP address, which might have a custom override, see #582