Revert "Merge pull request #34 from ianthe/LIB001-516"

This reverts commit 6a066bf1c1211e4bbf6feaadb3362461fdd25b46, reversing
changes made to 7c28a365bb14c87b00376e0088cd4db98f147d2a.