Revert "Adding Back pr  #24 from GayashanNA/CARBON-14867"

This reverts commit 085db9d533b4fe254f1d1f47ca08a6a8f7913eb9.