Fixing REGISTRY-2262
Clean the fix by removing commented out old code
Merge branch 'ajithnv-master'