Revert "Fix for #166 and #119"

This reverts commit f91af9e7999a00b26c8f6b9cc198a8f716c7e893.