Convert #264285 to Flügger