Convert #264867 to Flügger