I've been torturing varnish with this change for some time and was
not able to reproduce the problem.

Should fix #2719.