This reverts commit 9e85eb9a2ef1ba2e4e19f233e0cc114dfd07a6dc. Change-Id: Id1ac803b29931b0f643cb37bbe58534726c36f1e