Convert #264307 to Flügger