Revert "Merge branch 'datalib-exceptions'"

This reverts commit 271f0a876182fd909521408a0695f98f0559b4b0, reversing
changes made to 54e286ad5eb39bd8e48b2b2b2d71be29d24ba6bb.