Revert "closes #121"

This reverts commit a935712e0152342ab9940e1f8ff69eb962cf19ea.