Revert "Fix for Bug NMS-6551"

This reverts commit 80bd05b4f441b8ec457cfe1f442f85698fbca494.
Merge remote-tracking branch 'origin/1.12' into release-14.0.2