Revert "Fix for #6 and #8"

This reverts commit 814d1a8b228715b3868b0607407b154eb7ba0741.