Recover the ability to 'b CheckFailed' after r231577