See attached build log. (Please do not complain about the need for looking at the build log until you can provide an easy way to open bugs with the correct data picked out of a tinderbox log. Thanks.)
Created attachment 243969 [details] Build log
Created attachment 288331 [details, diff] proposed patch I've confirmed the QA concerns go away with this patch applied.
dropped from the tree, use sci overlay versions instead