This reverts commit 43738e9d15. Reason for revert: Resolved in I3a6d8a1486558db1622c2c447256024eed8773ae Change-Id: I7c2cdf93cbe61816d4d6c8f334ca6fdc095c53c8
43738e9d15