Issue #1822048 followup by tim.plunkett: Consider improving/removing the concept of 'broken' handlers.
