temporary revert commit 66a3b85

should fix issue 20