Convert #264887 to Flügger