Convert #264282 to Flügger