this patch appears to not be needed any more