Fix platform display in places where it was broken by ff8dfd43d86b.

I'm pretty sure this shouldn't be changed, it's the form field.