Conflict nit: Fix bug in recent commit.