Convert #264407 to Flügger