Oops, forgot to commit this with the last change