Follow our own d710 again

Change-Id: I551122dcc9630bf7db7460a8c822df90017ec6d2