This reverts commit 0bd35ea2f3. Closes-Bug: PROD-24331 Change-Id: If1cd867e4253fc21ce2af8af1d638aab02bd6855
0bd35ea2f3