Inline rethrowOrIndicateConnectionFailure here
Get rid of rethrowOrIndicateConnectionFailure entirely