Convert #264909 to Flügger