Revert a change which broke certain SDR aggs [978]