Merge "Revert "do not auto offload connections with non-zero mark""