Convert #264642 to Flügger