@kbidarka needs to take locale testing into account too. Will be careful about it.

ok, reverting.