revert of ConnectionWrapper changes