Fixing REGISTRY-2262
Clean the fix by removing commented out old code
Merge branch 'ajithnv-master'
Merge pull request #74 from shamrath/master

Clean and merge the pull request sent from ajithv master repo