Revert "Fixed #191, #182, #83: DiskStore concurrency issue"

This reverts commit e2abbf46dd41ee18e1ea1e89fb5a9ce7a26509ca.