Convert #264477 to Flügger