Convert #264596 to Flügger