Uh, that function needs another header
Merge bug25945 again
stable to default