Required getting rid of some hacks like c19a71652804cd5738a0317ffd3d14f461ae3d70 and 02796fd9b614b9ba875482198e53f2218e8bacba @vldly For this I see some details in the commit message but do you know of a more concrete path to resolve this?