Revert "Merge pull request #137 from parndt/patch-1"

This reverts commit 91a0e538a40edeb7d321c7b57c2240695398b012, reversing
changes made to d3d5670f6029d8567c20d3fbf3a09cfce3992503.