Revert "DZna220614"

This reverts commit 88de325f15792151325bce4dbe1daaca9e7da5ea.