This reverts commit b62c19206f, reversing changes made to 104926c6ed. Contributes to issue CURA-4414.
b62c19206f
104926c6ed