Convert #264079 to Flügger