After the linked ticket is implemented: LG-1908, replace the current workaround with the officially supported solution