API change post bug 25572.