Fix that last revert

Change-Id: I2a0cd1be3b3231911edc0b3d93bee2a471550dfb