remove use of __connection header

@tfoote @wjwwood Please review.