Convert #266079 to Flügger