we can remove this branch if the patch is accepted as-is, correct?