nvda

abef7b5d - Revert #17573 and #16248 (#18318)

Revert #17573 and #16248 (#18318) Reverts PR Reverts #17573, #16248 Issues fixed n/a Issues reopened n/a Reason for revert #18271 is a more general implementation, fixed from the root #16246.