Revert "codegen fix for delayed/Avar"

This reverts commit f3252de9b2bcc9dd98484862eca32424f7fecdaf.