reverting pubsub changes.. just no point