Use our trusted logic

Change-Id: I2c879cf3d9d650947f55faa455752d2115568792