Convert #264197 to Flügger