Revert "[#1014] Merge pull request #307 from nzakas/master"

This reverts commit 7753c9140ef29569bb2e77920a7906605d2ae294.