Convert #264436 to Flügger