Dedouble translations

Change-Id: I42b22961747a5f75c1eee13e4cf9aa3904d3cb86