Revert "Merge pull request #1 from HeSe/gemstone-3.1"

This reverts commit d731a1ee5d499dd342bbad569e2401d28787ce11, reversing
changes made to 9d50c4d03a12a27c095778fe6f3bcb511763aeac.