Back out file type guessing change (related to issue 6866)