Update array patch to match the patch I submitted upstream