Fix a regression which could lead to GenericFutureListeners never been notifed. Part of [#2186].

This regression was introduced by commit c97f2d2de00ad74835067cb6f5a62cd4651d1161