Merge "Remove unnecessary workaround to vogar escaping issue"