Undo dubious code that causes crashes