IDEX-1597: don't use depricated methods