OF-787: Reverting changes for OF-2

Reverting patch that was applied to address OF-2, because it broke TLS
handling for S2S connections.