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