Revert "Merge pull request #87 from pitr-ch/master"

This reverts commit c3a3d9d9b6c708bf9d1d17be9fea6a70c42a8ee2, reversing
changes made to 15decb65e5769d99edf424a1b9bfffd4d4865a52.

PR #87 wasn't quite ready to go, so reverting.