The work done on HHH-13587 Closed caused a performance regression (oddly) which needs to be corrected.