will be subsumed by the NewMapper feature when that is exported to all sites, which will happen soon.