Revert "Diskstore support."

Putting this on its own branch.

This reverts commit bda5de2a981891c6d90638479a3dcc4dd7c758a8.