Rework of the change reverted by 8380b02d6. Change-Id: Ic50144ae7a0c1c075b1922e6b6387a38073da606
8380b02d6