Revert from APIPA to test routing approach