Convert #264031 to Flügger