Convert #266379 to Flügger