Convert #264679 to Flügger