API change.
Resurrect
merge bug25488 into default