Missed these changes when cherry picking.