This reverts commit 52c943d88e088894e61e054964ec91ffe410a0bc. Change-Id: I63f4aa2efd386300c070521c5bccf1c6ac5c594e