Convert #264935 to Flügger