Here's a version of the patch with a test.

(sent to the right list this time)