Yeah, a little bigger but cherry-pickable, and we might as well keep the two branches in sync on patches like these unless there's a good incentive the other way.