A comment explaining why we split this into two calls would be useful...