Removed patch that was merged into trunk in 6bc1de83a7

This patch is now redundant