Convert #264036 to Flügger