Merge "2nd attempt to fix Slice strict mode."