Revert current implementation for addressing Varnish/ESI special chars in layout handles issue.