Convert #117398 to Flügger