Change order of file discovery to match original order.