Merge "Revert include-raw-escape to include-raw"