Remove use of PubSubMessageBuilder

Temporarily replace with WebMessageHeaderAccessor