Revert "Fix for Bug NMS-6551"

This reverts commit 80bd05b4f441b8ec457cfe1f442f85698fbca494.