menu entries were not deleted. Backport from trunk r65622.
Attach a file by drag & drop or click to upload
