Convert #264381 to Flügger