Convert #266338 to Flügger