API change
Merge bug 26000 (into stable this time)