Fix double escaping after D4638

Auditors: epriestley