Create non xlated values too!

(cherry picked from commit a9c6f01a35cce47142e5dadaa400f232e66c0482)