Bill's change in r95336 broke empty aggregates embedded