FileView: Partially revert last commits due to lack of testing