Addendum to commit #16654.