Reverting wrong merger - PR #18 from elo7/master

This reverts commit 24479b5742fc287a58bf31100d20d3f8d0443a3b, reversing
changes made to e2b7fae6c6674cd883c433f8f936af0fd7842f52.