Is this a bug we should pull out into a separate commit?