Revert "CU-600"

This reverts commit 796b22a25794308385106923cadc4a31708d5893.