Revert "apply changes from #43"

This reverts commit 878098f855e734a9ac47ef1d1832664abb5e0454.