Commit f11e8be3 broke this; it was right in Peter's original patch, but I messed it up before committing.
Attach a file by drag & drop or click to upload
