Revert "Merge branch 'pr/16'"

This reverts commit 15a7eaee51161f30f9a0133f78aa0f1ea3de72ba, reversing
changes made to 6a3ebe818e6cd61163c6412c694708984e830485.