Convert #448670 to Flügger