API change.
Merge bug 26255 again