Revert "Try something for issue #21."

This reverts commit 37cd07e018970345faf1638e29b6d89417f0efca.