This patch is not needed anymore (nw)