Re-applying usekey/rowid fix.