Convert #264717 to Flügger