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

This reverts commit ca57e649d56089ec13caecdf69606ba51fe2ce23, reversing
changes made to 5b1d2e4627e2fde8e8a0c6f77546a58603aa5765.