Sorry, I attached the wrong patch (the other one that is waiting in
another thread), here again.