Revert "Revert "cm: Remove Focal""

This reverts commit 3353bc91fe0e7ac8f33e8c16b434f69dc1def94a.