[arch-dev-public] kernel/catalyst upgrade path broken