Convert #264803 to Flügger