Avoid extra query when overlapping IPs are disabled

Bug 1124363

Change-Id: I431d19a987e18ec2648d9cb0aad185e5ba68f830