This is a stop-gap measure to make breakpoints usable again.
Proper fix is still needed.

Reviewed-by: Friedemann Kleint