Revert wrongly removed functionality from p2 aggregator capability

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>