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

This reverts commit 994edf134d206964bf2581a786abf0702daf2d7f.