This reverts commit 5676de24da. Reason for revert: Desugaring causes regression on API 26+
5676de24da