Merge "Revert^2 "Ignore BIND_ABOVE_CLIENT for same-process connections"" into main