504e670d73
This reverts commit 8ed05a1567.
Reason for revert: Bringing back original change
Change-Id: I33bbc9b698e07ca8e03ee6b15bcb66f5795bbe4e