Revert "Don't mess with the build system a single day (git revert 83b35c64 -n!) before a major (git revert 83b35c64 -n) release"

Unbreak Linux build.

This reverts commit f806629f.