Revert "Fixing deprecation warnings"

This reverts commit 82b9b59522928863ddadeacfec819e287303ef20.

Change-Id: I746d7ae57802dc76618db9024a0cf94c43774c02
Merge "Revert "Fixing deprecation warnings""