I have not encountered the crash since applying 6f81e07ecb8c. I think we can call this one licked for now. I'll reopen this report if I experience the crash again.