Update for 5.14 compatibility

Noted by Andrew Psaltis in #22607