This reverts commit 7db97b0a29c613afb78c2734bf2504324a71963d. Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3