Followup to r5700: Adjust the changes so they are the same as in the BZR repository.
Attach a file by drag & drop or click to upload
