Revert "Fixes CS-4641"

This reverts commit 322229a692a6a6fc5b4d3101d08c1501bb0e036f.