Revert "merge conflict"

This reverts commit a1840bdc8b125c4f85e10f49005d8f9a12702ba8.
Revert "merge from https://github.com/apavlo/h-store.git"

This reverts commit 67c9fb1128a2c96318ea2db90fa1456c13d3fc14, reversing
changes made to c71de4d12f7ad53bfbfacdbf18597546fb0d8883.