Revert^2 "Rerun codegen"

77007dc422d3d855975cf60f42d472c62a92ad6d

Change-Id: I99a644bb9d3ad0ecc9882228f7390b12ece9d9da
2 files changed