Convert #264417 to Flügger