We actually load many services (in JDK sense), not just one.  So this really ought to be List<ServiceLoader>.  Which makes me think this change was not really needed.  Did you try without this change?