Backed out changeset: 5dac6a2debd2
util.pubsub: simplify a lot the previous changes.