Convert #264641 to Flügger