Leaving this for the visual design branch as this change affects all fields in the form.