Reverted r41655. Causes a text load on parser cache hit. Reduces parser cache hit...

Reverted r41655. Causes a text load on parser cache hit. Reduces parser cache hit performance especially for ES clusters. Messages not reverted on the assumption that this revert is temporary.