Resolve #135, a CF8-specific regression