Convert #264361 to Flügger