This reverts commit 12bd57bd, reversing changes made to e9d38d23.
In other words: This reverts !549 (merged) which breaks local builds on Mac and Windows/mingw64 and needs to be reworked. See discussion in !549 (merged).