Revert "Fix for issue #7."

This reverts commit e03cf036102405a8931fcd1b2574bd590e1ca31f.