Revert "Fixes #30"

This reverts commit b9e421024b792fdf1b29f36202bd7f4918a5b06a.
Issue fixed upstream.