Don't strip underscores from keys when trying to remove a translation mark

Backported from master a1e5070ab6bddcaa2d607e60c944d9c68e40ad2b