Revert "Merge pull request #2 from DrKLO/master"

This reverts commit 47da5a472f865e37dbee8136b352a837922dcd1d, reversing
changes made to 9aeb8be8938e6083376142a782166a15edf46743.
Merge pull request #3 from AlexGreg/revert_pull_request_1

Revert "Merge pull request #2 from DrKLO/master"