Convert #244759 to Flügger