Bringing back the change from 80a4178a, adapted to handle both the function collision and the issue mentioned in #7196.
Attach a file by drag & drop or click to upload