Convert #266231 to Flügger