recompose this grid

testing results for: sql
win2k12r2
Int-Win-i32
sql/test/scanner1.562 
raw_strings X X1.562 
71662 (default)