Convert #264538 to Flügger