Convert #264979 to Flügger