Convert #264098 to Flügger