Revert to CM4 dependency