According to the protocol documentation, matching the file name was
wrong.  This removes some awkward special-case code.