Updated: Comment #0
Furthermore, I made the change at the Form API level, making needless changes to the form structure.
Revert the Form API changes and use a template file
User interface changes
The form structure will be back as it was, so this reverts a minor API change.