Revert "improve handle_breakpoints performance"

This reverts commit e50838f1069a172a38f9fc6d8c057744b018b653.
retriggering travis