Convert #264347 to Flügger