Convert #264418 to Flügger