I think we can now revert this change, `for` instead of `while`, 2 lines less? ;)