Revert "PDI-4326"

This reverts commit 0d13181e6b26d60737161da111d56fdf3ddd502d.