It was integrated upstream. Added comment and reference to upstream commit. Also tried not to break HEAD by skipping the patch if building that.