Convert #264927 to Flügger