Convert #264279 to Flügger