Add the fix to the overriding default gateway even though its rarely hit. Previous patches that were reverted had this but they are not in the tree anymore