Moved these changes into the default attributes for Ubuntu.  Returning this file to stock master.