Revert "Quick fix for G5.listen"

This reverts commit 3f53ea54f4d3ab998c21f57319902e312d958ac9.