This brings them up to date with the changes in #8144. Signed-off-by: Austin Seipp <aseipp@pobox.com>