Merge "Revert "Work around Firefox 57 attribute parsing regression""