This patch was merged again today.