This reverts commit 1417558e. Also reverts commit 019a92bb. This causes check-sanitizer to fail. The "-Nolib" variant of the test crashes on startup in the loader.