I've given this a brief test and it seems to do the job:

http://gist.github.com/567577

This has been committed.