Revert "Fix error in codegen"

This reverts commit 9e004da1d90a431d9654ee25f826a2acc1f16c0c.
TBR=@jmesserly