refs #10530. Update according to Andrei's binning observations.