Please do not merge, this patch is a tag that's on the wrong commit.