This reverts commit db9ae43a. Reason for revert: perf regression b/232504244 Change-Id: I38cf43cfe3f19c6faa9279cc06cdad94fd65dd0b