Convert #264029 to Flügger