Revert "Revert to b6dcb2427ff603309f46f0eb0004fbda7637063c"

This reverts commit 2f5ff1994361a80a6201dafaaf290dff793d304b.
Last try today evening to fix the build.