Revert "Merge pull request #1 from jameswald/support"

This reverts commit 6a9d80aabe27a1d10a7b75d5a187eedcac21cf92, reversing
changes made to 3d0c4d053a112205522cc6bc95cd7fd376fbf336.