Fix issue where source address of router generated traffic is not respected (part 2)