Convert #264275 to Flügger