This PR saved this unmaintained port from the chopping block next week. PR: 196642 Submitted by: Yoshiaki Kasahara