Probably this patch is better than reverting.

Thoughts?

Ludo’.