This reverts commit 3a24898f5553e72589eaba3aeb5ef8f63909dd64. Change-Id: I86de9a7fe9f72748c7ac33d9df7fd1fbd8007f7c