patch has been applied upstream