This reverts commit 75261d01df. Reason for revert: roll forward Change-Id: I0b66ba4ea918baf54ae084f6281c172a07b160b2
75261d01df