d710,... moar woes

Change-Id: Ic994279a865f6ab67845941565a550255d50e9d8