Convert #264849 to Flügger