Convert #264409 to Flügger