Convert #264539 to Flügger