Re-add fix from 9f50c4bd12303674890ca742ce6b9592a29e3ba9, which was lost in f2abaf8698a34a44d8a80d80756b0f843560e31d.
Re-add fix from 9f50c4bd12303674890ca742ce6b9592a29e3ba9, which
was lost in f2abaf8698a34a44d8a80d80756b0f843560e31d.

gquintard/Varnish-Cache,gquintard/Varnish-Cache,gquintard/Varnish-Cache,gquintard/Varnish-Cache