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

This reverts commit 77be8347b3ba0974ecba471406b75d16962c09e4, reversing
changes made to b7757bc06ebc19779e049a7a3ca32c4bf94660ef.