Whoops.  That last commit had some newer code.  Removed it for history's sake.