Found in the process of trying to figure out #19193, but I doubt it's going to fix that. (cherry picked from commit abc50cf6)