Convert #264845 to Flügger