This reverts commit 58ae164100. Change-Id: I6d9942b41694f6a5e6c211df839aa385eea0c496
58ae164100
504bb9e7