D710 uses it's own props.  Revert this if we ever change

Change-Id: I377ea1eea25b10ee700f1f6a8341ce2ff3a37f49