Merge "Revert "Revert "Remove don't bother checks"""
am: f040585a6b

Change-Id: I14571cf3fc6bc6a68bd926f5a4f012396e311cc1