Convert #172297 to Flügger