Addition to a2ad4b5a266a.