revert the merge from http://github.com/jdebrabant/h-store.