Re-add listener support.