Revert "Merge and close PR #43"

This reverts commit f6b5e90f09ec6eee622e62dc8a97ef94eda19fd7, reversing
changes made to 35dce9b92bc92d3221c2142f73b6ab8d04132e5e.