This reverts commit bf35f4af51cddd743435bb6b94a45592c967891a. There was an error in a shared-library build.