We needed to modify a lot of test code that expected the old style.