Move fix Issue 12153 to frontend

See #3285

Moves the fix into the front-end so everyone benefits.

NB: I haven't yet read any of the comments in that PR.