Revert "Merge remote-tracking branch 'origin/jira/NMS-6800' into rc/stable/1.14.0"

This reverts commit 009d1a702d0835e0c8d6e03f26af074cadd9620f, reversing
changes made to 4deac572af90490fd454f4a41516967db2b056e9.
Revert "Merge remote-tracking branch 'origin/jira/NMS-6864' into rc/stable/1.14.0"

This reverts commit 4deac572af90490fd454f4a41516967db2b056e9, reversing
changes made to cf1763d85e3fd8d94e16f8d30a413c48b95751f7.