This reverts commit 6e405f84b8d0c7c0f939bc8e9bec17e65e704a2d. Change-Id: I9593273d414aee1f9817f84b462cf45360ff19e3