tree ef87e4ff5685d98a300407de21b16913f76ed5b8
parent 074b4f4e575901734c6c713fc960033875207a71
author Ian Zerny <zerny@google.com> 1673614628 +0000
committer Ian Zerny <zerny@google.com> 1673614726 +0000

Revert "Revert incorrect refactor."

This reverts commit 3b6af16133dc3544069fbfbc6c30ec3bd601dcfe.

Reason for revert: test failures

Change-Id: Ibfc074ad3172751723e84f1f572ce60f4a5cbdf9