Follow up fix for 5ce02865c.