Issue #3469808 by christian.wiedemann, pdureau: Use decorator instead overwriting the component plugin service