The same was nearly at the same time proposed in #12705.

@xabbuh Yes I know, but I thought we should do it separately for each component

@amansilla Actually, I think that it will be hard to follow changes later if there are more than twenty commits doing all the same change.

@xabbuh You are totally right

#12705 has been merged. So there's probably no need for this anymore, right?

@xabbuh right you can remove it.