Fix missed merge conflicts
Whitespace fixups to match 3.0.x
Remove old code to preserve tls attributes