Revert "Simplify aspiration window code"

This reverts commit a55fb76dcc66c9cc17a81a9a99dd506108ee1fee.

bench: 4810752