Increase the paranoia

Change-Id: I980e2313ecf17ba3418fcba965e8ad9a07366eb3