Revert a change which broke certain SDR aggs [978]

Note this is NOT everything needed to close book on a 1.4 release, just a necessary step.