Revert 5c3ce452, e85e0aae and 6131dc97 for now

They break the build if parallelised and make jenkins upset
Move vcl_hash close to vcl_recv