This reverts commit 845b923507. Reason for revert: Fixed via a different patch Change-Id: I1743afdd7b8516b39501839d74bbed6bdb797e0c
845b923507