Revert "Potentially resolves issue #18. Check if it has desired functionality."

This reverts commit 5c3dd15b872643353b9f9644f5f2ea96041695ed.