Ugh, two patches got crossed. This is the correct first one.
Attach a file by drag & drop or click to upload