Revert "escape_html should always return string, add missing to_s"

This reverts commit ee67e6572d2eda054ab4aa7a8600db85ee8d1694.