Revert "[APOLLO-1978] - removing listener"

This reverts commit 389f9780a75aa45608cb316c19781ae5e677636c.
[APOLLO-1978] - putting listeners back in