Use new htable format that won't cause data loss