Revert "Adding fix for REGISTRY-2220"

This reverts commit 58261cee22b94b38d9f9bc6f5852694487f5db4b.