first step in backout of bad default->3.5 merge d085b4f779af.  Create new head and fix whitespace.
1 file changed