Convert #264843 to Flügger