This reverts commit b472cd8f.
Cherry picking c520b38a from master and fixing conflicts would be too invasive for realease branch.
As we don't merge release branches back to master, we can simply revert the original change here.
DSD-3392
