I don't remember why I ever did this last year when we started code gen... dumb me.