Revert "Merge pull request #27 from slangerx/7.x"

This reverts commit 008f6a43111d2770ae09777bf57c592020cf4c16, reversing
changes made to 6eb4375fd41dfef1a52c654cbbeee0d8a22a1e87.