This reverts commit 640beb38e7710b939b3cfb3f4c54accc694b1d30.
The change being reverted was some codegen clean up, and cause compilation and performance issues. Reverting for now until we can get a better solution.
Change-Id: Ib1b6c277fcbdd55f50b9e6a4ae961c4b9b006e09
clang-format not found in user’s local PATH; not linting file.