Fix stalls/mailboxes getting removed on a cancelled block break