Revert "Merge pull request #3 from Khazrak/master"

This reverts commit 6f27a73a361dff6a4042045bb37ccd443dcf7f93, reversing
changes made to 190fcd3189908b43ad71af76a820cf7985590ec7.