Convert #264734 to Flügger