Convert #264608 to Flügger