Convert #264949 to Flügger