Revert unintended changes to stay in sync with CarbonDev