Paranoia

Change-Id: I93030cf98850391fec318b233ddb0b372f57dfce