Revert "DATA-1964"

This reverts commit 06695b5c21c9a7b21cde98a0b4e6354870b5c894.