Revert "Changes for issue #41"

This reverts commit a8976e253efa911fb8e5af17232ff7e21d968fd9.