Moved fix from a6d80f75 to just affect field help_text, not the entire field container, since that was breaking any grouped fields