Revert "Implementation of Issue #101"

This reverts commit 91c2b642ae61a297838b2cc29d27c77b663fafaa.