Revert for the moment as it breaks pubsub handling