Oops, I totally misread this function. Sorry, will put it back (and add a test!).