Shouldn't this be in a separate commit?