Fixes #10343 Maybe we'll finally migrate off of those legacy models some day... (cherry picked from commit f60782f11fd03b302bb81387f24fd56795f3c6bf)
Fixes #10343 Maybe we'll finally migrate off of those legacy models some day... (cherry picked from commit f60782f11fd03b302bb81387f24fd56795f3c6bf)