Follow-up r79964: Fix double parsing of file info