Adding fix for REGISTRY-2220
Revert "Adding fix for REGISTRY-2220"

This reverts commit 58261cee22b94b38d9f9bc6f5852694487f5db4b.
Adding fix for issue REGISTRY-2220
fix for CARBON-14874
Merge changes from isuru udana for pull#42
Merge branch 'isudana-master' for pull#42
merging pull#35. changes from subash
Merge branch 'subash89-master' for pull#35