Revert "final fix for #78"

This reverts commit 8141c158544f64459b3bccf4edb7675b1c0123ea, per
request in #84.