Convert #264529 to Flügger