The original diff was created against GPLv3 code. Don't apply this to our GPLv2 tree.