This reverts commit 2f09fbf2433e42be70a78021a8fa68a0a118b770. Change-Id: I57899fc1366c389c0f5468598e8ec3da0d2306ab