Revert "Fix generator handling"

This reverts commit 458b6b1adb642180690f6dc90ab8527fd8872894.

Bug: 66677
Change-Id: I5d639dc81664b4bc0567adf2230d9baa869b4f07
Merge "Revert "Fix generator handling""