Revert "Issue #37." due to issue #42.

This reverts commit d871dcfb0532ed88b8a8584253c864a93e539431.