This fixes working behind another router which gives out ULAs. SVN-Revision: 36416
SVN-Revision: 35889