Convert #264620 to Flügger