Reverting https://github.com/google/capirca/commit/0bbddd9b3708c167a4ce75c3cccdc5c1804714ed to what it was previously while preserving the use of new variables provided by other changes. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=121721924
Reverting
https://github.com/google/capirca/commit/0bbddd9b3708c167a4ce75c3cccdc5c1804714ed
to what it was previously while preserving the use of new variables provided by
other changes.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=121721924

rarcotvmw/capirca,pettai/capirca,sneakywombat/capirca,pettai/capirca,google/capirca,sneakywombat/capirca,ryantierney513/capirca,google/capirca,rarcotvmw/capirca,sneakywombat/capirca,ryantierney513/capirca,google/capirca,google/capirca,ryantierney513/capirca,rarcotvmw/capirca