Revert "Merge branch 'pr/127'"

This reverts commit d97bc83313e5fcf449f2ad578a29dba9a9116732, reversing
changes made to 1b23a7216a5651b42225693771eecdcb071c3da3.

reopens #127