Revert "Merge pull request #1794 from annapopova1/PDI-10767"

This reverts commit 4d438741682373dc4a10031df9a1f0d0ca7efdf7, reversing
changes made to 0138ff8800413579d4f5d7a8dd5fbcccf3d4ec85.
Merge pull request #1826 from annapopova1/PDI-10767-revert

Revert "Merge pull request #1794 from annapopova1/PDI-10767"