Ok, patch submitted upstream.