It's not clear to me why this `yield` is going away -- can you explain this?  (I want to make sure I understand what's going on here so I can support it well in the future).