Revert commits made by PR #45 and #46

Addresses #47