This reverts commit 184ae963e7. Change-Id: Iac60fc52a5b0c153945c22b97394546a529d3bb4
184ae963e7
6c0f337d52