Revert "Merge pull request #185 from derbyparty/master"

This reverts commit fc901fb3db03df1a668556e31ee4acba8debc167, reversing
changes made to 826a67bcfcbb9046b5e8ddcc3e6e145b5b616fe3.