Convert #264885 to Flügger