Two patches attached:

1. revert f527942e6bdd9f198db90f2de99a0482e9be5b1b, because the commit message was incorrect.

2. reapply it with a correct commit message.

If you apply both patches, the balance of changes should be zero (except for the commit messages).

Sorry for the confusion.
Coeur