This reverts commit 302ef7eaf3f4bd216c30e122e7aa1e87a9e465af. Change-Id: I9f82b55d2e87d69621613ad9d231a37e58477db9