Worked out fine so far, because the next line was empty, but this can
easily change...

Cherry-picked from Arctica GH 3.6.x branch.