This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c. Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f