Re-assigned to Antonio as his patch does apparently not have the desired effect (or is ineffective in its upstream version).