Remove some accidentally added code in conntrack fix.
Remove some accidentally added code in conntrack fix.

matthewdupre/felix,neiljerram/felix,neiljerram/felix,beddari/calico,Metaswitch/calico,neiljerram/felix,neiljerram/felix,kasisnu/calico,matthewdupre/felix,TrimBiggs/calico,TrimBiggs/calico,kasisnu/calico,alexhersh/calico,Metaswitch/calico,beddari/calico,ocadotechnology/calico,anortef/calico,ocadotechnology/calico,alexhersh/calico,anortef/calico