The previous cherry-pick was bad. This should fix it.
Attach a file by drag & drop or click to upload
