Revert "Fix twig template used for translatable fields"

This reverts commit dff88acc6f32f328c8fc0d01239d1aa0b8cea92e.
Merge branch 'master' into PIM-1783