Revert "Closes #217"

This reverts commit aa9e8608c1c9c2ebd1eedb62062f5d94edcd2353.