Reverted the proposed compose fix as since compose 2.2.1 things seemingly work again without needing the fix.