Reenabling some code whose absence causes violent crashes