recompose this grid

testing results for: sql
mac-mini
Cla-Dar-i64
sql/test/BugTracker-201535.700 
constant-random.Bug-3836 X O0.320 
66821 (default)