Fixed by the same patch that fixed #21625.