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