Convert #172807 to Flügger