Merge "Use OldLocalFile::selectFields()"