You need to update to a more modern code base pretty soon, and you should fix it in your repository. Until that happens I can handle any changes we decide are appropriate, but I think we're going to end up closing this PR to do some more comprehensive work on it.