LPS-32067 Re-add, else it will fail on service classes in plugins