Revert "NXP-14879: Use interfaces for Aggregate/Bucket"

This reverts commit 73c7d89a567e31f36ccc9f19c398f66505c6c18d.