Revert "Merge pull request #92 from nfioraio/master"

This reverts commit 789fb082b59b15b471b6de397862b85f04400e56, reversing
changes made to b16dff11b484ffd4491cd383d0c2c63798ebf3fd.