Fixup patch 0001 for upstream.