Might be worth rebasing it on the current codebase and sending a new patch update.