Re-add code that doesn't break anything.