This reverts commit 9a5dcb8c44a0f64b4abfd8f2bc19136c42cf1232. Change-Id: I8bb04608b99358c7a07871cd4adf0de2143d7f3a