Revert "Merge pull request #24 from GayashanNA/CARBON-14867"

This reverts commit 078045d9f572668b627bf38a69dd95e81a4af3eb, reversing
changes made to 00cc6a5467a1a5561ea0dc3f0f8e5c082302d901.