Restore the changes from Nick