removed deprecated (since 4.9) method
(cherry-picked from 22bd93a)