Gittrac #4115:  New format is turned on in code, old format is turned
off; tests are changed to work with new format.