Add back config options that were lost because of dirty merge