Fix for bnc#846011

No need for re-mapping.