Revert "Work around for Issue #28"

This reverts commit 430f446a1945a489218a407b60186a3c50229564.