Revert "Resolves #70"

This reverts commit 5b784f20a646114ff27a2c65b1cdddbd7557424c.