This reverts commit e1f10cbd7ff6128171b6ab37b3afbfdc3d9f9f33. Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee