Blocked on build fixes propagating sufficiently. See https://github.com/CTSRD-CHERI/cheribsd/pull/1732. NB: Option removal would be blocked on CheriBSD Jenkinsfiles no longer enabling it, so would need to be a two-step process.