This started as a way to fix !1533 (closed), but the rabbit hole was a bit deeper.
/cc @mattst88
Intel CI Windows build MacOS build