Committer edit: Removed one offending case and fixed another, see #4039
Signed-off-by: Asad Sajjad Ahmed <asadsa@varnish-software.com>