Revert "Revert "And removing Varnish again...""

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