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

This reverts commit 96a18471881d9c250fefb6b6e8d5875a4e5d143d, reversing
changes made to 3686660fe29c6e2e5319f8cd7d6488020b0adfd5.