Merge "Remove desugar support"