Oops, previous patch had a typo in the commit message.