Convert #264415 to Flügger