Re: build breakage with SCMI