Convert #264119 to Flügger