I’ve been informed that there’s a fix for this pending under this PR:
If you keep an eye on that PR, once its merged, an hour or so later, the builder will grab the fixed version and you can try building a custom firmware again.
If you use the nightlies, the next build will have those fixes.