Revert "Make library more tolerant"

 * Somehow borked that up.

This reverts commit 19ffb8faae43444efe540a6afb19b57d15943524.
4 files changed