Revert kf/filediinfo

This reverts commit 63fb8219dc1062890a144d5cb61d305ab3b8709d.
This reverts commit d912e42bd253bc460d53c09b49205a52d9e24110.

Possibly responsible for #7984