This patch has been merged into upstream, delete it