Convert #266324 to Flügger