Revert "Revert "Remove don't bother checks""

This reverts commit 04ccfaf7ab311dc10dbce435690c1cea5e492a9e.

Change-Id: I312ffefbef428998516dbf646d2f13c8c3086a4c
1 file changed