Revert "Merge branch 'pr/76' into 0.3.1"

This reverts commit cdd6aacd09df8a9af5e91ea8457053c2ab9bbe92, reversing
changes made to a29ec2435fa0a6e8d0f3fb85fdbcb63debde419c.