Convert #264579 to Flügger