Reverts 7702fb66f and replaces it with an event fired only on listener registration to a constant signal