Paranoidify the device tree

Change-Id: I6a047de5af07d2debda72e239f951696f8f68934