I'll PR separately for it (since it isn't needed specifically for this PR).