Revert "Merge pull request #28 from euromake/bug17"

This reverts commit 994bafaf70aae217aa6bd13147cd2362bb4abe89, reversing
changes made to d350372758a7eb6bd720e1d778d6f8293b842303.