Unpacked arguments in push-listener
Revert "Unpacked arguments in push-listener"

This reverts commit faaf4c2e7a492354d0a62c7c0cab8956b0c6f187.