This reverts commit 9808af71a190844cd5eb493d87870238a31fa408. Change-Id: I0e019534c07b230173230d064c6d8bc389fafcbc