[hot-fix] Resurrected identity-map feature (reverse from 718017394fe3b04b7)