Undo regression that broke wallet aggregation