Needs testing on live instances.
Upstream PR with tls fixes.
Closes #945 (closed)
This will create a new commit in order to revert the existing changes.
