Revert "Don't mess with the build system a single day (git revert 83b35c64b6e1f7c90b5...