Add r184420 back, but also handle long file names.