Bing back changes in Default.pm that were lost during my merge.