Merge wrong escape removal with 3.3.