just a pattern that returns from time to time, encapsulated into a new method so we can remove some code.

(cherry picked from commit dadbdf90)