This reverts commit 580aa54b98ad30a260e7b20bf7dde5c9a2468d8e. Change-Id: I20a240792d1a73c21b4d36b3c3c51c9c75f81e31