The new structure of forms is that they are always in a BaseDialog (class .dialog-panel) (which provides header and footer.)
The true determinant of how a dialog and form should be rendered is whether they are displayed in a Modal.
Therefore change css files to set style dependant on whether the items are in a .modal class.