Rollback KeyValueStorage interface