Convert #264489 to Flügger