TS-1820 Make it compile on FC19/20.