Convert #266426 to Flügger