This was initially done in b85577bb96, but reverted when merging and solving conflicts from 2.3 branch (07de76122b).
b85577bb96
07de76122b