This reverts commit 8f120e688f82813b699c163a084be48e92d63386. Change-Id: If03fe5d427d90f65ba28ade2573d90e83ce8a4e4