commit 4cd8073bbace01fd3b2d9d6756ca7e35b7a44d33
Author: Joel Pittet <joel@pittet.ca>
Date:   Tue Oct 6 01:18:25 2015 -0700

    better

diff --git a/core/lib/Drupal/Core/Template/TwigMarkup.php b/core/lib/Drupal/Core/Template/TwigMarkup.php
index 0344a80..d642183 100644
--- a/core/lib/Drupal/Core/Template/TwigMarkup.php
+++ b/core/lib/Drupal/Core/Template/TwigMarkup.php
@@ -15,25 +15,12 @@
 class TwigMarkup extends \Twig_Markup implements MarkupInterface {
 
   /**
-   * The string to escape.
-   *
-   * @var string
-   */
-  protected $string;
-
-  /**
-   * The string's character set.
-   *
-   * @var string
-   */
-  protected $charset;
-
-  /**
    * Constructs an TwigMarkup object.
    *
    * @param string $string
-   *   The string to escape. This value will be cast to a string.
+   *   The string containing markup to wrap as an object.
    * @param string $charset
+   *   The character set used when counting, defaulted to utf-8 for convenience.
    */
   public function __construct($string, $charset = 'utf-8') {
     parent::__construct($string, $charset);
@@ -42,20 +29,6 @@ public function __construct($string, $charset = 'utf-8') {
   /**
    * {@inheritdoc}
    */
-  public function __toString() {
-    return $this->string;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function count() {
-    return function_exists('mb_get_info') ? mb_strlen($this->content, $this->charset) : strlen($this->content);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function jsonSerialize() {
     return $this->__toString();
   }