Revert "More work on #42"

This reverts commit 6b42d4088ac512f8b9a367a9d45586584043e0bb.