Fixed checkin of wrong old files. Hopefully this is the end of the test failure.