Fix for listenToOnce mem. leak

This is a failing test demonstrating #3226, then a patch that makes the test pass.
Actually, is there a way we could use the eventsAPI for this instead?