Are you sure this patch should be part of this commit?