Convert #266317 to Flügger