Convert #266385 to Flügger