The lib tests need to be fixed as well. This unbreaks the tarball job. This reverts commit 00ba557856.
00ba557856