Partly revert commit #433528 (body_field format placement)

You committed a change to biblio.module with http://drupal.org/cvs?commit=433528 (fixing #935562: Biblio block and Restric users to view own biblio entries) which may have included a 'debug mistake'.
(This means the change is in 6.x-1.15 too.)

The format fieldset is now in $form['format']; it was in $form['body_field']['format'].
1) I don't see the reason mentioned in above issue (though there may be one. But the 6.x-2.x line does not contain this change either.)
2) This does not work well with the 'Better Formats' module; Better Formats adds another format fieldset to $form['body_field']['format'], which doesn't work and is completely confusing.