Follow our own d710 again

Change-Id: I551122dcc9630bf7db7460a8c822df90017ec6d2
Let's try to fix this one more time,...

Change-Id: I3548ad138d3419646150ae2b164a005c8ec2f595