Revert "Try new listeners"

This reverts commit 2e70aa8e1ca6014d9b14d3de61b5a4882a8a2899.