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