I know this isn't really your problem but I'd like to remove this patch if we're updating and it hasn't been accepted upstream.