API: Really fixing bug 10898 this time