Convert #264597 to Flügger