Merge "Revert "Desugar default methods if required""