Convert #264983 to Flügger