Convert #266419 to Flügger