This reverts commit 815c5f21. Reason for revert: Proper fix done here: ag/23733066 Change-Id: I4f46dfaac39d6e85ea8042e4590de00c94edb6cd