Convert #264929 to Flügger