Added this to rev#86683.