Convert #264828 to Flügger