Revert "Fix build after ag/2001747 breakage."

This reverts commit 2b3b590ff62c432c93d006767409f93ed2c6e53f.

This change is being reverted because it broke the git_master build
for full-eng and other targets.
2 files changed