Convert #264677 to Flügger