The original commit (r80178) was correct. The bug was introduced during the backport, funny :-)
Attach a file by drag & drop or click to upload
