Revert "Merge pull request #622 from killabytenow/master"

This reverts commit 392bae3c453763e8f887f447678ab0202a36228a, reversing
changes made to 61cd9ee8b63bdd34fd3b5ebd58f2de3fce507a61.