Move `escape` fix to browser-upgrade lib