Revert changes to hstore; formalize notion that jsonb and hstore are fully separate