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

This reverts commit 2fb02e16cf8a6698227ecb98d7a142333f0e6837, reversing
changes made to 246764bbee37342b9f930797e3799af0469719fd.