This reverts commit 9119325a. A buildbot is broken, probably because of this change breaking the SHARED_LIBS=ON build more.