Unreviewed, address post-landing review comments for r248431.