Convert #264644 to Flügger