Revert "Fix for #128"

This reverts commit 47bff6ea22dfc66092d34f5646f0118e985236e4.