Convert #264229 to Flügger