Revert accidental commit related to PubSub that went in to previous merge.
@mkslanc @Amirjanyan @ruben @vasili