This patch is not needed any more