port 2e329666(r35370)

  original commit message:
  ... instead of doing stack magic.  This is a cleanup in preparation for the new generators implementation.

BUG=

Review URL: https://codereview.chromium.org/1893943002

Cr-Commit-Position: refs/heads/master@{#35555}