Restore removed code