Revert "fixing DS-909"

This reverts commit a91597f15bf75fb47283adfaf6b740f2df6ebbec.