806dace32d
Motivation: 806dace32d introduce a compilation error due a bad cherry-pick from 4.1 Modifications: Use correct API for master branch. Result: No compile error anymore