keeping up with api changes

(cherry picked from commit e5bdf02705b2bf562313fef6de6c66d06098e46c)