Convert #244377 to Flügger