Revert "Merge pull request #1 from ordavidil/master"

This reverts commit 97fe70b16b1ac527172f95a474c5e403410807f1, reversing
changes made to b0d87e9b7b85089289c35a07d6cce24bce781761.
I don't like GIT.