This is only necessary because of the poll_frame implementation.
Removing it altogether would be another solution.