Convert #264475 to Flügger