[Bug 63633] Use UCD compat decompositions