Move some of the default options and values back over.