This commit will break build - found the cause.

Intellij javac2 wants to add NonNull Annotation on DownloadService2, which
causes a ClassCastException. Will investigate more.