r6384 didn't go quite far enough. In fact, a grid square which