b4ef4638a6
Also fixes similar issues introduced by the same recent change. Added FIXME note about possible TLS malfunction regarding horizon. Change-Id: I5f46a9306139eb550d3849757c8bdf0767537c78 Closes-Bug: #1844016 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>