We are still using 7-year as the default, right?  If so this change isn't needed.