Revert cda8b79; it's just that we don't batch yet