Revert "And removing Varnish again..."

This reverts commit adcff5c69d3f355b599495e6f47b13f431b0aec4.
Merge branch 'refs/heads/master' into test