Revert last change for pull request on issue #29

This reverts commit f74b64261250f4ca1778d3a8ee915b3f3f0939df.