Updated patch is in #6706.