This reverts commit 6f82b8d8. This broke scons build, and reportedly clover with autotools/meson too.