Updated as per other repo (non-varnish).