Merge "Revert "Remove desugar support""