Revert "Making the file form conform with other forms"

This commit was a huge mistake. It should have been removed long ago.

This reverts commit 81425c9e982e86a0afbb8bacd58c4887c871b419.
get rid of eroneous dependency on newer (and broken) DF