Revert "Merge branch 'moving-data-store-to-sqlite'"

This reverts commit 3f2ae211157c3c48b0a557a11862fb5698ca71b9, reversing
changes made to b116bc1cf55251119ddc23048a3d6a49fa909c29.