Paranoidify the tree...yet again..!

Change-Id: Iab0ed15e6e60f0ce2fba25cd5bd6514065df5df0