Revert "Merge pull request #2 from jmorrell/master"

This reverts commit 9dab3952d7f38381f503846460cde4235fd0443e, reversing
changes made to 15acc2fc3e0185bfa9dd797685ddf174d6123ae4.
1.4.0