Fix mangling of the v2.16.x test/data commit somewhere along the line.