3cc12f33f4
was masked. However KIMURA Yasuhiro-san noticed my mistake and was kind enough to provide a better patch in PR 55581. I've merged that into the routine. Hopefully I've not overlooked anything this time. MFC After: 5 days