Take over change in tls.c too (from same commit)