Merge "[Horizon] Drop the obsolete Horizon workaround"