Convert #264396 to Flügger