Restore code removed in previous manual updates.