put back code wrongly commented out in [30539]