None of this should have been removed.