Revert "Fixing CARBON-14870"

This reverts commit a4a7793a0aaed6acbbf981fd53bc38b234119350.