Merge "Remove old remapping hacks from Database::indexName()"