Convert #264235 to Flügger