Revert "Merge pull request #138 from j08lue/master" in light of issue
139.

This reverts commit 4b459b0e9367ad331074ad9cd3d0e28627811952, reversing
changes made to a68aeb3f352bc62e7166d17e1a13bd82855e2380.