Switch back to cm kernel for now and remove assert for beta testing