Merge "Revert "Add a check in the location summary.""