Revert "DEV-20008"

This reverts commit f9ef619751fae1b62cc3251c03cd953137c0ab46.